Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SUNS sprites wave 1. Clothing #2439

Closed
wants to merge 67 commits into from
Closed

SUNS sprites wave 1. Clothing #2439

wants to merge 67 commits into from

Conversation

Draggeru
Copy link
Contributor

@Draggeru Draggeru commented Oct 29, 2023

About The Pull Request

Adds a bunch of faction sprites for SUNS. This PR ONLY has clothing. Species alts will be added later

suns sprites
Not pictured: The CMO coat and SUNS soft spacesuits since they're being bastards.

This PR does NOT introduce these sprites anywhere in the game, it simply adds them to the code.

Why It's Good For The Game

Factions having their sprites is good.

Current todo:

  • Fix the SUNS soft suit helmet and suit
  • Fix the CMO coat
  • Fix the XO beret's type path so that it's not confusing
  • Add a bulletproof vest for SUNS peacekeepers
  • Fix the scientist labcoat so that it works as a toggleable hood
  • Add the captains mask because I forgor

🆑
add: Adds all of the clothing intended for SUNS. Including uniforms for the captain, xo, cmo, scientists, miners, engineers, and doctors
/:cl:

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Oct 29, 2023
@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added DME Edit Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Oct 29, 2023
@rye-rice
Copy link
Member

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Oct 29, 2023
@Draggeru
Copy link
Contributor Author

Why is run linters failing gwuh

Draggeru and others added 22 commits November 4, 2023 23:58
Co-authored-by: GenericDM <[email protected]>
Signed-off-by: Thedragmeme <[email protected]>
Co-authored-by: GenericDM <[email protected]>
Signed-off-by: Thedragmeme <[email protected]>
Co-authored-by: GenericDM <[email protected]>
Signed-off-by: Thedragmeme <[email protected]>
Co-authored-by: GenericDM <[email protected]>
Signed-off-by: Thedragmeme <[email protected]>
Co-authored-by: GenericDM <[email protected]>
Signed-off-by: Thedragmeme <[email protected]>
Co-authored-by: GenericDM <[email protected]>
Signed-off-by: Thedragmeme <[email protected]>
Co-authored-by: GenericDM <[email protected]>
Signed-off-by: Thedragmeme <[email protected]>
Co-authored-by: GenericDM <[email protected]>
Signed-off-by: Thedragmeme <[email protected]>
Co-authored-by: GenericDM <[email protected]>
Signed-off-by: Thedragmeme <[email protected]>
Co-authored-by: GenericDM <[email protected]>
Signed-off-by: Thedragmeme <[email protected]>
Co-authored-by: GenericDM <[email protected]>
Signed-off-by: Thedragmeme <[email protected]>
Co-authored-by: GenericDM <[email protected]>
Signed-off-by: Thedragmeme <[email protected]>
Co-authored-by: GenericDM <[email protected]>
Signed-off-by: Thedragmeme <[email protected]>
Co-authored-by: GenericDM <[email protected]>
Signed-off-by: Thedragmeme <[email protected]>
Co-authored-by: GenericDM <[email protected]>
Signed-off-by: Thedragmeme <[email protected]>
Co-authored-by: GenericDM <[email protected]>
Signed-off-by: Thedragmeme <[email protected]>
Co-authored-by: GenericDM <[email protected]>
Signed-off-by: Thedragmeme <[email protected]>
Co-authored-by: GenericDM <[email protected]>
Signed-off-by: Thedragmeme <[email protected]>
Co-authored-by: GenericDM <[email protected]>
Signed-off-by: Thedragmeme <[email protected]>
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Nov 8, 2023
@Draggeru
Copy link
Contributor Author

Draggeru commented Nov 8, 2023

This PR is irrecoverably fucked, it keeps undoing other sprite PRs and I can't fix it. If someone else who knows what to do to fix this they're welcome to take a crack at it. I don't have the time or knowledge to do this in a way that's not overtly difficult.

@Draggeru Draggeru closed this Nov 8, 2023
github-merge-queue bot pushed a commit that referenced this pull request Feb 5, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Picks up where the brave Draggeru left off, giving her sprites a second
chance at life!

More information can be found in the original PR
#2439

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
I want my pompous bastards and I want them NOW


![278865636-bde939c3-534a-4d05-b0a0-a782d611d4dd](https://github.com/shiptest-ss13/Shiptest/assets/86762641/c1dc3f65-5896-41ca-a475-aa0028aea1c4)

Note: The majority of these items are still unimplemented, although some
can now be found on the Aegis. The primary goal of this PR is to give
future SUNS ships something to work with (and maybe allow for some
cheeky events in the meantime)

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl: Draggeru, Cre
add: adds all of the clothing intended for SUNS, including uniforms for
the captain, xo, cmo, scientists, miners, engineers, and doctors
add: several job outfits to support future SUNS content
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: Skies-Of-Blue <[email protected]>
Co-authored-by: meem <[email protected]>
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Feb 7, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->
Picks up where the brave Draggeru left off, giving her sprites a second
chance at life!

More information can be found in the original PR
shiptest-ss13#2439

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->
I want my pompous bastards and I want them NOW

![278865636-bde939c3-534a-4d05-b0a0-a782d611d4dd](https://github.com/shiptest-ss13/Shiptest/assets/86762641/c1dc3f65-5896-41ca-a475-aa0028aea1c4)

Note: The majority of these items are still unimplemented, although some
can now be found on the Aegis. The primary goal of this PR is to give
future SUNS ships something to work with (and maybe allow for some
cheeky events in the meantime)

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

:cl: Draggeru, Cre
add: adds all of the clothing intended for SUNS, including uniforms for
the captain, xo, cmo, scientists, miners, engineers, and doctors
add: several job outfits to support future SUNS content
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: Skies-Of-Blue <[email protected]>
Co-authored-by: meem <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. DME Edit Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants